projects / vimb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51026d3 99300d7)
Merge branch 'geolocation' of https://github.com/fjallarefur/vimb.
authorDaniel Carl <danielcarl@gmx.de>
Mon, 18 Nov 2019 22:23:56 +0000 (23:23 +0100)
committerDaniel Carl <danielcarl@gmx.de>
Mon, 18 Nov 2019 22:23:56 +0000 (23:23 +0100)
1  2 
doc/vimb.1 patch | diff1 | diff2 | blob | history
src/main.c patch | diff1 | diff2 | blob | history
src/setting.c patch | diff1 | diff2 | blob | history

diff --cc doc/vimb.1
Simple merge
diff --cc src/main.c
Simple merge
diff --cc src/setting.c
Simple merge
my vimb build